merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 04:31:39 +0000 (06:31 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 04:31:39 +0000 (06:31 +0200)
1  2 
src/window.c

diff --cc src/window.c
Simple merge